Skip to content

Revert "[Deepin-Kernel-SIG] [linux 6.6-y] [Deepin] net: Fix kabi breakage for skbuff by exclude header"#1496

Closed
opsiff wants to merge 1 commit intolinux-6.6.yfrom
revert-1379-linux-6.6.y-2025-12-16-kabi-2
Closed

Revert "[Deepin-Kernel-SIG] [linux 6.6-y] [Deepin] net: Fix kabi breakage for skbuff by exclude header"#1496
opsiff wants to merge 1 commit intolinux-6.6.yfrom
revert-1379-linux-6.6.y-2025-12-16-kabi-2

Conversation

@opsiff
Copy link
Member

@opsiff opsiff commented Feb 10, 2026

Reverts #1379

Summary by Sourcery

Enhancements:

  • Remove Deepin KABI reserve conditional logic and custom GRO_MAX_HEAD definition from skbuff, relying on the upstream GRO header behavior again.

@sourcery-ai
Copy link

sourcery-ai bot commented Feb 10, 2026

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Reverts a previous Deepin-specific KABI workaround around GRO header sizing in skbuff, restoring the standard inclusion of <net/gro.h> without CONFIG_DEEPIN_KABI_RESERVE conditionals and custom GRO_MAX_HEAD macro.

File-Level Changes

Change Details Files
Remove Deepin-specific CONFIG_DEEPIN_KABI_RESERVE conditional around GRO handling and revert to the vanilla <net/gro.h> include.
  • Unconditionally include the standard <net/gro.h> header in skbuff.c
  • Remove the CONFIG_DEEPIN_KABI_RESERVE preprocessor guard block around GRO-related code
  • Delete the Deepin-specific GRO_MAX_HEAD macro definition tied to MAX_HEADER + 128
net/core/skbuff.c

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from opsiff. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've left some high level feedback:

  • Since CONFIG_DEEPIN_KABI_RESERVE is no longer special-cased here, double-check that there are no remaining references elsewhere that still assume a custom GRO_MAX_HEAD or different skb headroom when this config is set.
  • Consider briefly documenting in the commit message why reverting to the upstream gro.h behavior is now safe for Deepin-specific KABI requirements, to clarify the rationale for future maintainers.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Since CONFIG_DEEPIN_KABI_RESERVE is no longer special-cased here, double-check that there are no remaining references elsewhere that still assume a custom GRO_MAX_HEAD or different skb headroom when this config is set.
- Consider briefly documenting in the commit message why reverting to the upstream gro.h behavior is now safe for Deepin-specific KABI requirements, to clarify the rationale for future maintainers.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@opsiff
Copy link
Member Author

opsiff commented Feb 10, 2026

#1501

@opsiff opsiff closed this Feb 10, 2026
@opsiff opsiff deleted the revert-1379-linux-6.6.y-2025-12-16-kabi-2 branch February 10, 2026 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants